12cc76c915d87483ed58907f5e7aef0e559fb1ad,elide-datastore/elide-datastore-hibernate5/src/main/java/com/yahoo/elide/datastores/hibernate5/HibernateTransaction.java,HibernateTransaction,loadObjects,#Class#FilterScope#,145
Before Change
public <T> Iterable<T> loadObjects(Class<T> loadClass, FilterScope filterScope) {
Criterion criterion = filterScope.getCriterion(NOT, AND, OR);
CriteriaExplorer criteriaExplorer = new CriteriaExplorer(loadClass, filterScope.getRequestScope(), criterion);
return loadObjects(loadClass, criteriaExplorer, Optional.empty(), Optional.empty());
}
After Change
public <T> Iterable<T> loadObjects(Class<T> loadClass, FilterScope filterScope) {
Criterion securityCriterion = filterScope.getCriterion(NOT, AND, OR);
Optional<Expression> filterExpression = filterScope.getRequestScope().getLoadFilterExpression(loadClass);
Criteria criteria = session.createCriteria(loadClass);
if (securityCriterion != null) {
criteria.add(securityCriterion);
}
if (filterExpression.isPresent()) {
CriterionFilterOperation filterOpn = new CriterionFilterOperation(criteria);
criteria = filterOpn.apply(filterExpression.get());
}
return loadObjects(loadClass, criteria, Optional.empty(), Optional.empty());